modalDialog: Fix invalid argument 'timestamp' for pushModal

https://bugzilla.gnome.org/show_bug.cgi?id=722752

diff --git a/js/ui/modalDialog.js b/js/ui/modalDialog.js
index 960e0dca3ca8c48c27dd358a47961d9cc7de32ad..ac773056d72b7f7a20014d7358cdfa5b7a5b08d2 100644 (file)
--- a/js/ui/modalDialog.js
+++ b/js/ui/modalDialog.js
@@ -259,7 +259,7 @@ const ModalDialog = new Lang.Class({
         if (this.state == State.OPENED || this.state == State.OPENING)
             return true;
 
-        if (!this.pushModal({ timestamp: timestamp }))
+        if (!this.pushModal(timestamp))
             return false;
 
         this._fadeOpen(onPrimary);
@@ -318,8 +318,11 @@ const ModalDialog = new Lang.Class({
     pushModal: function (timestamp) {
         if (this._hasModal)
             return true;
-        if (!Main.pushModal(this._group, { timestamp: timestamp,
-                                           actionMode: this._actionMode }))
+
+        let params = { actionMode: this._actionMode };
+        if (timestamp)
+            params['timestamp'] = timestamp;
+        if (!Main.pushModal(this._group, params))
             return false;
 
         this._hasModal = true;